From 7b89279cfb3c4b3a327138f9aadee245fd08ca80 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 5 Sep 2005 20:05:58 +0000 Subject: [PATCH] Fix 64-bit build. --- linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c | 5 +++-- tools/xenstore/xenstored_core.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c index c891371b28..32091d2496 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c @@ -20,6 +20,9 @@ #include #include #include +#include + +unsigned long pci_mem_start = 0xaeedbabe; /* * PFN of last memory page. @@ -605,8 +608,6 @@ void __init parse_memopt(char *p, char **from) xen_override_max_pfn = (unsigned long) end_user_pfn; } -unsigned long pci_mem_start = 0xaeedbabe; - /* * Search for the biggest gap in the low 32 bits of the e820 * memory space. We pass this space to PCI to assign MMIO resources diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 3c7e6cc12d..10c9f5db33 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -719,7 +719,7 @@ static char *get_parent(const char *node) char *slash = strrchr(node + 1, '/'); if (!slash) return talloc_strdup(node, "/"); - return talloc_asprintf(node, "%.*s", slash - node, node); + return talloc_asprintf(node, "%.*s", (int)(slash - node), node); } static enum xs_perm_type perm_for_id(domid_t id, @@ -910,7 +910,7 @@ static bool commit_dir(char *dir) if (slash) *slash = '\0'; - dest = talloc_asprintf(dir, "%.*s", dot - dir, dir); + dest = talloc_asprintf(dir, "%.*s", (int)(dot - dir), dir); return rename(dir, dest) == 0; } -- 2.30.2